Merge fix for Bug#4238 from trunk
authorChong Yidong <cyd@stupidchicken.com>
Fri, 22 Jul 2011 15:23:43 +0000 (11:23 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Fri, 22 Jul 2011 15:23:43 +0000 (11:23 -0400)
commitccf38e88b051ccbbbcdfef9ad713f8e5ffd85adb
tree9a1d0fcd8802efebae8059a3694ffc592b389cd6
parent106c3702c2c7cd5020ba58c13d3fcbc300152c8b
parent76774280e40850c6b778c735d25c566a451284c3
Merge fix for Bug#4238 from trunk